bitkeeper revision 1.1406 (4284ffbbTZMaJCmCfmRMF-vfYquQ9w)
authorsmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Fri, 13 May 2005 19:27:55 +0000 (19:27 +0000)
committersmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Fri, 13 May 2005 19:27:55 +0000 (19:27 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/smh22/mwray-xend2.bk


Trivial merge